Close #1237 (refactor "pxa")