Add more fx/fl and unsafe-* versions