Removal of numeric pieces of the APF
Unify ?ASTORE instruction code
Move helper functions to util
Rename test