Adjusted slightly as per Z80 change, and to pull everything internally declared into the Amstrad CPC namespace.
Adjusted slightly as per Z80 change, and to pull everything internally declared into the Amstrad CPC namespace.

TomHarte/CLK,TomHarte/CLK,TomHarte/CLK,TomHarte/CLK,TomHarte/CLK