Move type signatures up
Align implementations of fas decls