Update to 1.6.4-R0.1

Removed suppressed 1.6.2-R1.0 API usage (i.e. use of "magic values", in
preparation for removal of API in post 1.6.4-R0.1).