Fixes for AMP code generation.